From 5b34724872709cdfe5c06d2f9e94ea50c268eaf3 Mon Sep 17 00:00:00 2001 From: KUWAMURA Shin'ya Date: Sat, 16 Jul 2011 09:16:48 +0100 Subject: [PATCH] [IA64] fix warning: "in_atomic" redefined This patch fixes `warning: "in_atomic" redefined'. # It is introduced by 22395:deb438d43e79. Signed-off-by: KUWAMURA Shin'ya --- xen/include/asm-ia64/linux-xen/linux/hardirq.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/include/asm-ia64/linux-xen/linux/hardirq.h b/xen/include/asm-ia64/linux-xen/linux/hardirq.h index b076644e24..b8a7b1d997 100644 --- a/xen/include/asm-ia64/linux-xen/linux/hardirq.h +++ b/xen/include/asm-ia64/linux-xen/linux/hardirq.h @@ -69,11 +69,13 @@ #define in_softirq() (softirq_count()) #define in_interrupt() (irq_count()) +#ifndef XEN #if defined(CONFIG_PREEMPT) && !defined(CONFIG_PREEMPT_BKL) # define in_atomic() ((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked()) #else # define in_atomic() ((preempt_count() & ~PREEMPT_ACTIVE) != 0) #endif +#endif #ifdef CONFIG_PREEMPT # define preemptible() (preempt_count() == 0 && !irqs_disabled()) -- 2.30.2